From bd624d14def967b88b965281133736a25ac6c91a Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Fri, 5 Oct 2018 14:01:09 -0400 Subject: [PATCH] Update debian/gbp.conf --- debian/gbp.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index c17ca62..a68ffd5 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -2,15 +2,16 @@ pristine-tar = True debian-branch = debian/master upstream-branch = upstream/latest -# Use gbp import-orig --uscan --upstream-vcs-tag=BABL_0_1_56 -# for instance when upgrading to 0.1.56. See https://bugs.debian.org/908316 -upstream-vcs-tag = invalid [buildpackage] sign-tags = True +[dch] +multimaint-merge = True + [import-orig] postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit +upstream-vcs-tag = BABL_%(version%.%_)s [pq] patch-numbers = False -- 2.30.2